Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 22:50:31 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 22:50:31 +0000 (22:50 +0000)
commitbfe30560c7aaa3a2fba62ea393d5c7d6399436be
treeb42f535b0165c2ca2f5ddb94d682413ea6d289d3
parent34c43a8079a3533f6a0c9c4c66a6a9c9bd0654e9
parentb4be53223acd30cc581060d7ec929da65bc49f45
Merge from mainline.